From 278f74b9c78fd2247bb518dada53cceb79c0f0de Mon Sep 17 00:00:00 2001 From: robertl Date: Mon, 28 Jul 2003 22:38:26 +0000 Subject: [PATCH] Remove zillions of unused local variables. --- arcdist.c | 3 --- copilot.c | 2 -- easygps.c | 1 - garmin.c | 1 - gcdb.c | 4 ---- gpspilot.c | 2 -- magnav.c | 2 -- mapsend.c | 2 -- mkshort.c | 2 +- pcx.c | 1 - polygon.c | 3 --- tpg.c | 2 +- 12 files changed, 2 insertions(+), 23 deletions(-) diff --git a/arcdist.c b/arcdist.c index 2e21ae904..66aef4f21 100644 --- a/arcdist.c +++ b/arcdist.c @@ -165,9 +165,6 @@ arcdist_process(void) queue * elem, * tmp; waypoint * waypointp; double dist; - waypoint ** comp; - int i, wc; - queue temp_head; extra_data *ed; double lat1, lon1, lat2, lon2; int fileline = 0; diff --git a/copilot.c b/copilot.c index f36a321d6..bb98370aa 100644 --- a/copilot.c +++ b/copilot.c @@ -183,8 +183,6 @@ copilot_writewpt(const waypoint *wpt) static void data_write(void) { - queue *elem, *tmp; - if (NULL == (opdb = new_pdb())) { fatal (MYNAME ": new_pdb failed\n"); } diff --git a/easygps.c b/easygps.c index cb53059ae..533fc384c 100644 --- a/easygps.c +++ b/easygps.c @@ -105,7 +105,6 @@ data_read(void) double d; do { unsigned char tag; - unsigned char ilen; waypoint *wpt_tmp; wpt_tmp = xcalloc(sizeof(*wpt_tmp), 1); diff --git a/garmin.c b/garmin.c index 50f0b3c55..b1c15607c 100644 --- a/garmin.c +++ b/garmin.c @@ -229,7 +229,6 @@ data_write(void) waypoint *wpt; char *ident; char *src = NULL; - char *wptname; wpt = (waypoint *) elem; diff --git a/gcdb.c b/gcdb.c index eb0c01a86..1d54eb0ce 100644 --- a/gcdb.c +++ b/gcdb.c @@ -92,7 +92,6 @@ wr_deinit(void) static void data_read(void) { - struct dbrec *rec; struct pdb *pdb; struct pdb_record *pdb_rec; @@ -242,10 +241,7 @@ static void gcdb_write_wpt(const waypoint *wpt) { struct dbrec *rec; - char *vdata; - char *recdata; static int ct; - int length; int reclen; char tbuf[100]; diff --git a/gpspilot.c b/gpspilot.c index 61362df27..f494b3b3e 100644 --- a/gpspilot.c +++ b/gpspilot.c @@ -228,8 +228,6 @@ gpspilot_writewpt(const waypoint *wpt) static void data_write(void) { - queue *elem, *tmp; - if (NULL == (opdb = new_pdb())) { fatal (MYNAME ": new_pdb failed\n"); } diff --git a/magnav.c b/magnav.c index fbae0af40..2788a36c8 100644 --- a/magnav.c +++ b/magnav.c @@ -224,8 +224,6 @@ my_writewpt(const waypoint *wpt) static void data_write(void) { - queue *elem, *tmp; - static char *appinfo = "\0\x01" "User\0\0\0\0\0\0\0\0\0\0\0\0" diff --git a/mapsend.c b/mapsend.c index 153af1d0f..743506a3d 100644 --- a/mapsend.c +++ b/mapsend.c @@ -565,11 +565,9 @@ void mapsend_track_disp(const waypoint * wpt) unsigned char c; double dbl; int i; - unsigned int u; int t; int valid = 1; static int last_time; - static int centi; /* * Version 4.06 (at least) has a defect when it's set for .01km diff --git a/mkshort.c b/mkshort.c index c292bf001..a6a87727d 100644 --- a/mkshort.c +++ b/mkshort.c @@ -130,7 +130,7 @@ mkshort_del_handle(void *h) if (hdr) { for (i = 0; i < PRIME; i++) { - queue *e, *t, *z; + queue *e, *t; QUEUE_FOR_EACH(&hdr->namelist[i], e, t) { uniq_shortname *s = (uniq_shortname *) e; dequeue(e); diff --git a/pcx.c b/pcx.c index 5ba54d38f..6f8c96001 100644 --- a/pcx.c +++ b/pcx.c @@ -77,7 +77,6 @@ data_read(void) char latdir, londir; long alt; int symnum; - char alttype; char date[10]; char time[9]; waypoint *wpt_tmp; diff --git a/polygon.c b/polygon.c index 411484386..4393e6698 100644 --- a/polygon.c +++ b/polygon.c @@ -187,9 +187,6 @@ polygon_process(void) { queue * elem, * tmp; waypoint * waypointp; - waypoint ** comp; - int i, wc; - queue temp_head; extra_data *ed; double lat1, lon1, lat2, lon2; double olat, olon; diff --git a/tpg.c b/tpg.c index ac62d1261..3a081cec0 100644 --- a/tpg.c +++ b/tpg.c @@ -75,7 +75,7 @@ tpg_fread_double(FILE *fp) test_endianness(); } - tpg_fread(buf, 1, 8, tpg_file_in); + tpg_fread(buf, 1, 8, fp); if (i_am_little_endian) { return *(double *) buf; } -- 2.30.2